Avoid compiler warnings
authorMatthias Clasen <mclasen@redhat.com>
Tue, 7 Jan 2014 01:35:01 +0000 (20:35 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 7 Jan 2014 01:35:29 +0000 (20:35 -0500)
tests/testsplitheaders.c

index 6be3ca9257cbb2f93379a365ffe3f69a74d66605..38ec298c7e9ac72e282ea021ba0ba7e50fa58145 100644 (file)
@@ -1,19 +1,18 @@
 #include <gtk/gtk.h>
 
 static void
-split_decorations (GObject    *obj,
-                   GParamSpec *pspec,
-                   gpointer    data)
+split_decorations (GtkSettings *settings,
+                   GParamSpec  *pspec,
+                   GtkBuilder  *builder)
 {
-  GtkBuilder *builder = data;
   GtkWidget *sheader, *mheader;
   gchar *layout, *p1, *p2;
   gchar **p;
 
-  sheader = gtk_builder_get_object (builder, "sidebar-header");
-  mheader = gtk_builder_get_object (builder, "main-header");
+  sheader = (GtkWidget *)gtk_builder_get_object (builder, "sidebar-header");
+  mheader = (GtkWidget *)gtk_builder_get_object (builder, "main-header");
 
-  g_object_get (obj, "gtk-decoration-layout", &layout, NULL);
+  g_object_get (settings, "gtk-decoration-layout", &layout, NULL);
 
   p = g_strsplit (layout, ":", -1);
 
@@ -43,23 +42,23 @@ main (int argc, char *argv[])
 
   builder = gtk_builder_new_from_file ("testsplitheaders.ui");
 
-  win = gtk_builder_get_object (builder, "window");
+  win = (GtkWidget *)gtk_builder_get_object (builder, "window");
   settings = gtk_widget_get_settings (win);
 
   g_signal_connect (settings, "notify::gtk-decoration-layout",
                     G_CALLBACK (split_decorations), builder);
   split_decorations (settings, NULL, builder);
   
-  entry = gtk_builder_get_object (builder, "layout-entry");
+  entry = (GtkWidget *)gtk_builder_get_object (builder, "layout-entry");
   g_object_bind_property (settings, "gtk-decoration-layout",
                           entry, "text",
                           G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);                      
-  check = gtk_builder_get_object (builder, "decorations");
-  header = gtk_builder_get_object (builder, "sidebar-header");
+  check = (GtkWidget *)gtk_builder_get_object (builder, "decorations");
+  header = (GtkWidget *)gtk_builder_get_object (builder, "sidebar-header");
   g_object_bind_property (check, "active", 
                           header, "show-close-button",
                          G_BINDING_DEFAULT);                      
-  header = gtk_builder_get_object (builder, "main-header");
+  header = (GtkWidget *)gtk_builder_get_object (builder, "main-header");
   g_object_bind_property (check, "active", 
                           header, "show-close-button",
                          G_BINDING_DEFAULT);